From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 21 Apr 2009 06:56:51 +0000 (+0000)
Subject: (diff-find-source-location): Don't call
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~775
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a8f10dcc77254fc8252c9e080c614b10186ed986;p=emacs.git

(diff-find-source-location): Don't call
diff-sanity-check-hunk when NOPROMPT is non-nil.  (Bug#3030)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21e6aa3ccd8..66374e69b45 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-21  Martin Rudalics  <rudalics@gmx.at>
+
+	* diff-mode.el (diff-find-source-location): Don't call
+	diff-sanity-check-hunk when NOPROMPT is non-nil.  (Bug#3030)
+
 2009-04-21  Kenichi Handa  <handa@m17n.org>
 
 	* international/uni-decomposition.el: Re-generated.
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index a83200d8982..6242cda13c4 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1575,7 +1575,9 @@ NOPROMPT, if non-nil, means not to prompt the user."
            ;; the user may disagree on what constitutes the hunk
            ;; (e.g. because an empty line truncates the hunk mid-course),
            ;; leading to potentially nasty surprises for the user.
-           (_ (diff-sanity-check-hunk))
+	   ;;
+	   ;; Suppress check when NOPROMPT is non-nil (Bug#3030).
+           (_ (unless noprompt (diff-sanity-check-hunk)))
 	   (hunk (buffer-substring
                   (point) (save-excursion (diff-end-of-hunk) (point))))
 	   (old (diff-hunk-text hunk reverse char-offset))